871319aa9b47bc6e95577e435c5d12a642b1a4bb,sling/core/src/main/java/org/apache/sling/core/impl/SlingMainServlet.java,SlingMainServlet,activate,#ComponentContext#,248
Before Change
protected void activate(ComponentContext componentContext) {
// setup server info
Dictionary<?, ?> props = componentContext.getBundleContext().getBundle().getHeaders();
Version bundleVersion = Version.parseVersion((String) props.get(Constants.BUNDLE_VERSION));
String productVersion = bundleVersion.getMajor() + "."
+ bundleVersion.getMinor();
After Change
protected void activate(ComponentContext componentContext) {
// setup server info
BundleContext bundleContext = componentContext.getBundleContext();
Dictionary<?, ?> props = bundleContext.getBundle().getHeaders();
Version bundleVersion = Version.parseVersion((String) props.get(Constants.BUNDLE_VERSION));
String productVersion = bundleVersion.getMajor() + "."
+ bundleVersion.getMinor();
this.serverInfo = PRODUCT_NAME + "/" + productVersion + " ("
+ System.getProperty("java.vm.name") + " "
+ System.getProperty("java.version") + "; "
+ System.getProperty("os.name") + " "
+ System.getProperty("os.version") + " "
+ System.getProperty("os.arch") + ")";
// prepare the servlet configuration from the component config
Hashtable<String, Object> configuration = new Hashtable<String, Object>();
Dictionary<?, ?> componentConfig = componentContext.getProperties();
for (Enumeration<?> cce = componentConfig.keys(); cce.hasMoreElements();) {
Object key = cce.nextElement();
configuration.put(String.valueOf(key), componentConfig.get(key));
}
// get the web manager root path
Object wmr = configuration.get("sling.root");
this.slingRoot = (wmr instanceof String) ? (String) wmr : null;
if (this.slingRoot == null) {
this.slingRoot = "/";
} else if (!this.slingRoot.startsWith("/")) {
this.slingRoot = "/" + this.slingRoot;
}
// ensure the servlet name
if (!(configuration.get("servlet-name") instanceof String)) {
configuration.put("servlet-name", PRODUCT_NAME + " "
+ productVersion);
}
// setup servlet request processing helpers
this.slingServiceLocator = new ServiceLocatorImpl(bundleContext);
this.slingAuthenticator = new SlingAuthenticator(bundleContext);
this.servletResolver = new SlingServletResolver(bundleContext, slingServletContext);
this.errorHandler = new ErrorHandler(bundleContext, slingServletContext);
// register the servlet and resources